removed redundant RGBA double registration

"RGBA double2 was registred twice, once per name, once per id.

diff --git a/babl/babl-core.c b/babl/babl-core.c
index f66b191eeb1c25d654517501f5d34c8656878d64..00e43e82cfc4a5bae5de2fc93792ad44c2cbec05 100644 (file)
--- a/babl/babl-core.c
+++ b/babl/babl-core.c
@@ -133,16 +133,6 @@ babl_core_init (void)
     babl_component_from_id (BABL_ALPHA),
     NULL);
 
-  babl_format_new (
-    "id", BABL_RGBA_DOUBLE,
-    babl_model_from_id (BABL_RGBA),
-    babl_type_from_id (BABL_DOUBLE),
-    babl_component_from_id (BABL_RED),
-    babl_component_from_id (BABL_GREEN),
-    babl_component_from_id (BABL_BLUE),
-    babl_component_from_id (BABL_ALPHA),
-    NULL);
-
   /*
      babl_conversion_new (
      babl_model_from_id (BABL_RGBA),

diff --git a/babl/babl-model.c b/babl/babl-model.c
index 11a3dd1c3b43c98b856078745947a378a5ee13db..be2cddeda96f615715ce358331cc96bf0eddb15d 100644 (file)
--- a/babl/babl-model.c
+++ b/babl/babl-model.c
@@ -244,10 +244,15 @@ static Babl *reference_format (void)
 
 static Babl *construct_double_format (Babl *model)
 {
-  void *argument[42 + 1];
+  void *argument[44 + 1];
   int   args = 0;
   int   i;
 
+  if (model == babl_model_from_id (BABL_RGBA))
+    {
+      argument[args++] = "id";
+      argument[args++] = (void*) BABL_RGBA_DOUBLE;
+    }
   argument[args++] = model;
   argument[args++] = babl_type_from_id (BABL_DOUBLE);